From 1041fd670334f92db6b20fd044ddd4641ff8aa6c Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@gmail.com>
Date: Sat, 28 Apr 2018 12:36:59 -0600
Subject: [PATCH] move appveyor builds to newer versions of Qt with msvc only.

---
 appveyor.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 52f5b3b2e..fb92123b7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,24 +2,30 @@ version: 1.0.{build}
 
 environment:
   matrix:
+  # MinGW gui builds fail with Qt newer than 5.6 as webkit and webengine are missing.
   # MinGW
-  - name: win32
-    platform: mingw
-    qt: 5.5\mingw492_32
-    tools: mingw492_32
+  #  - name: win32
+  #    platform: mingw
+  #    qt: 5.5\mingw492_32
+  #    tools: mingw492_32
   # MinGW
+  #  - name: win32
+  #    platform: mingw
+  #    qt: 5.6\mingw49_32
+  #    tools: mingw492_32
+  # do a build with the minimum level of Qt we support.
+  # MSVC x32
   - name: win32
-    platform: mingw
-    qt: 5.6\mingw49_32
-    tools: mingw492_32
+    platform: x86
+    qt: 5.7\msvc2015
   # MSVC x32
   - name: win32
     platform: x86
-    qt: 5.6\msvc2015
+    qt: 5.9\msvc2015
   # MSVC x64
   - name: win64
     platform: amd64
-    qt: 5.6\msvc2015_64
+    qt: 5.9\msvc2015_64
 
 init:
   - if %platform%==mingw set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
@@ -27,7 +33,6 @@ init:
   - set PATH=C:\Qt\%qt%\bin;%PATH%
   - if not %platform%==mingw call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%
 
-# Flesh out with amd64/msvc cases later.
 build_script:
   - ps: |
       # be aware that vcvarsall will reset platform amd64 to X64!
@@ -47,9 +52,10 @@ build_script:
         Get-ChildItem .\gui\release\GPSBabel-*-Setup.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Setup.exe" }
         Get-ChildItem .\gui\release\GPSBabel-*-Manifest.txt | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Manifest.txt" }
       }
-      elseif (($env:platform -eq "x86") -and ($env:qt -eq "5.6\msvc2015"))
+      elseif (($env:platform -eq "x86") -and ($env:qt -eq "5.9\msvc2015"))
       {
-        & ".\tools\make_windows_release.ps1" -gpsbabel_build_dir_name "build-GPSBabel-Desktop_Qt_5_6_MSVC2015_32bit-Release" -gui_build_dir_name "build-app-Desktop_Qt_5_6_MSVC2015_32bit-Release" -mkspec win32-msvc2015 -mkcmd nmake.exe
+        # full build and deploy of our release configuration
+        & ".\tools\make_windows_release.ps1" -gpsbabel_build_dir_name "build-GPSBabel-Desktop_Qt_5_9_MSVC2015_32bit-Release" -gui_build_dir_name "build-app-Desktop_Qt_5_9_MSVC2015_32bit-Release" -mkspec win32-msvc2015 -mkcmd nmake.exe
         $sha=(git rev-parse --short HEAD)
         Get-ChildItem .\gui\release\GPSBabel-*-Setup.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Setup.exe" }
         Get-ChildItem .\gui\release\GPSBabel-*-Manifest.txt | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Manifest.txt" }
-- 
2.30.2